From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 10 Jul 2010 19:01:01 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~4568^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0;p=emacs.git

Merge changes from emacs-23 branch.
---

7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0